member/models.py

@@ -13,6 +13,7 @@ from TimeConvert import TimeConvert as tc

                 from coupon.models import CouponInfo
              

                 from kodo.basemodels import BrandInfoMixin
              

                 from mch.models import ModelInfo
              

                +from account.models import LensmanInfo
              

                 from simditor.fields import RichTextField
              

                 from utils.qiniucdn import qiniu_file_url
              

                 
              
@@ -997,6 +998,12 @@ class MemberActivityContributionInfo(BaseModelMixin, BrandInfoMixin):

                     def admindata(self):
              

                         unlock_welfares = MemberActivityContributionWelfareUnlockingInfo.objects.filter(activity_id=self.activity_id, user_id=self.user_id)
              

                         unlock_welfares = [unlock_welfare.data for unlock_welfare in unlock_welfares]
              

                +        act = MemberActivityInfo.objects.get(activity_id=self.activity_id, status=True)
              

                +
              

                +        if act.activity_type == 4:
              

                +            user_name = LensmanInfo.objects.get(user_id=self.user_id, status=True).name
              

                +        else:
              

                +            user_name = self.user_name
              

                         return {
              

                             'contribution_id': self.contribution_id,
              

                             'brand_id': self.brand_id,
              
@@ -1007,7 +1014,7 @@ class MemberActivityContributionInfo(BaseModelMixin, BrandInfoMixin):

                             'content_type': self.content_type,
              

                             'title': self.title,
              

                             'content': self.content,
              

                -            'user_name': self.user_name,
              

                +            'user_name': user_name,
              

                             'user_avatar': self.final_user_avatar,
              

                             'images': self.final_images,
              

                             'video_url': self.video_url or '',